Remove obsolete dependencies/conflicts (w3-el, emacs22 packages, etc.).

diff --git a/debian/changelog b/debian/changelog
index 96df04b5f8bccbefb1ac669a9a8fc2468e3e4006..0b3a3dbf253bf03e7c5ed8ed4316e0e7407ab886 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,20 +6,22 @@ emacs23 (23.1+1-2) unstable; urgency=low
     #532597, and #532602.)
 
   * Add libpm-dev and libdbus-1-dev build dependencies.  Thanks to
-    Sven Joachim <svenjoac@gmx.de>.
+    Sven Joachim <svenjoac@gmx.de> for reporting this and most of the
+    following additional issues.
 
   * Fix a spelling error, fix a menu section error, add a version to
     the GPL file referred to by debian/copyright, and add a number of
     debian/emacsVER*.lintian-overrides to quiet long-standing
-    warnings.  Thanks to Sven Joachim <svenjoac@gmx.de> for the
-    reminder.
+    warnings.
 
   * Fix update-alternatives to reflect the fact that all the binaries
-    have manpages now.  Thanks to Sven Joachim <svenjoac@gmx.de> for
-    the suggestion.  Rename manpages from NAME.1FLAVOR to
+    have manpages now.  Rename manpages from NAME.1FLAVOR to
     NAME.FLAVOR.1.
 
- -- Rob Browning <rlb@defaultvalue.org>  Sun, 02 Aug 2009 16:52:20 -0700
+  * Remove obsolete dependencies and conflicts (w3-el, emacs22
+    packages, etc.).
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sun, 02 Aug 2009 19:13:04 -0700
 
 emacs23 (23.1+1-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index adf1e1c431ce5bb5d66b7dcc887a6e066fcc0454..e1cb068b8da6f5628cc674eebf477e8e756aeace 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Architecture: any
 Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
-Conflicts: emacs23-nox, emacs23-gtk, w3-el
+Conflicts: emacs23-nox, emacs23-gtk
 Replaces: emacs23-nox, emacs23-gtk
 Description: The GNU Emacs editor
  GNU Emacs is the extensible self-documenting text editor.
@@ -36,7 +36,7 @@ Architecture: any
 Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
-Conflicts: emacs23, emacs23-gtk, w3-el
+Conflicts: emacs23, emacs23-gtk
 Replaces: emacs23, emacs23-gtk
 Description: The GNU Emacs editor (without X support)
  GNU Emacs is the extensible self-documenting text editor.
@@ -49,7 +49,7 @@ Architecture: any
 Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
-Conflicts: emacs23, emacs23-nox, w3-el
+Conflicts: emacs23, emacs23-nox
 Replaces: emacs23, emacs23-nox
 Description: The GNU Emacs editor (with GTK+ user interface)
  GNU Emacs is the extensible self-documenting text editor.
@@ -71,8 +71,7 @@ Priority: optional
 Architecture: all
 Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends}
 Suggests: emacs23-el, emacs23-common-non-dfsg
-Conflicts: emacs23-el (<< ${Source-Version}), w3-el, emacs22-common-non-dfsg (<< 22.2+2-1)
-Replaces: emacs22-common (<< 22.2), emacs22-common-non-dfsg (<< 22.2+2-1)
+Conflicts: emacs23-el (<< ${Source-Version})
 Description: The GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure

diff --git a/debian/control.in b/debian/control.in
index 212bb3d2a2cd062e76542fc4c16eef18fa122004..97a676525bc2d8120647c0c79634958cd602ec10 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -24,7 +24,7 @@ Architecture: any
 Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@-nox, @DEB_FLAVOR@-gtk, w3-el
+Conflicts: @DEB_FLAVOR@-nox, @DEB_FLAVOR@-gtk
 Replaces: @DEB_FLAVOR@-nox, @DEB_FLAVOR@-gtk
 Description: The GNU Emacs editor
  GNU Emacs is the extensible self-documenting text editor.
@@ -36,7 +36,7 @@ Architecture: any
 Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-gtk, w3-el
+Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-gtk
 Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-gtk
 Description: The GNU Emacs editor (without X support)
  GNU Emacs is the extensible self-documenting text editor.
@@ -49,7 +49,7 @@ Architecture: any
 Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, w3-el
+Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox
 Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox
 Description: The GNU Emacs editor (with GTK+ user interface)
  GNU Emacs is the extensible self-documenting text editor.
@@ -71,8 +71,7 @@ Priority: optional
 Architecture: all
 Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends}
 Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg
-Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), w3-el, emacs22-common-non-dfsg (<< 22.2+2-1)
-Replaces: emacs22-common (<< 22.2), emacs22-common-non-dfsg (<< 22.2+2-1)
+Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version})
 Description: The GNU Emacs editor's shared, architecture independent infrastructure
  GNU Emacs is the extensible self-documenting text editor.
  This package contains the architecture independent infrastructure